gtk: Don't include gtkstylecontext.h from gtkcsstypesprivate.h

And make sure it's included everywhere it's needed.

diff --git a/gtk/gtkassistant.c b/gtk/gtkassistant.c
index 8d3d67cd1db93b4cd08d89750a5f9d9e2b8998a4..1306bb4bd21f5554b07b8f69b1c13b4d53ac4753 100644 (file)
--- a/gtk/gtkassistant.c
+++ b/gtk/gtkassistant.c
@@ -74,14 +74,15 @@
 #include "gtkintl.h"
 #include "gtkimage.h"
 #include "gtklabel.h"
-#include "gtkstack.h"
+#include "gtklistlistmodelprivate.h"
+#include "gtkmaplistmodel.h"
 #include "gtkprivate.h"
 #include "gtksettings.h"
 #include "gtksizegroup.h"
 #include "gtksizerequest.h"
+#include "gtkstack.h"
+#include "gtkstylecontext.h"
 #include "gtktypebuiltins.h"
-#include "gtklistlistmodelprivate.h"
-#include "gtkmaplistmodel.h"
 
 #include "a11y/gtkwindowaccessible.h"
 

diff --git a/gtk/gtkbutton.c b/gtk/gtkbutton.c
index 6b2346cdbae2fdc48681db7af29ee2119aabd9f5..8414bec0e39e3deb54abbb2b799648656cc96213 100644 (file)
--- a/gtk/gtkbutton.c
+++ b/gtk/gtkbutton.c
@@ -66,6 +66,7 @@
 #include "gtkmain.h"
 #include "gtkmarshalers.h"
 #include "gtkprivate.h"
+#include "gtkstylecontext.h"
 #include "gtktypebuiltins.h"
 
 #include "a11y/gtkbuttonaccessible.h"

diff --git a/gtk/gtkcellarea.c b/gtk/gtkcellarea.c
index 3fc37a3dac2d7a3fbf5351e74c814afbf0469e56..eb4db09263645b4c5cf3fa8271feb1ec6e549f82 100644 (file)
--- a/gtk/gtkcellarea.c
+++ b/gtk/gtkcellarea.c
@@ -352,6 +352,7 @@
 #include "gtkmarshalers.h"
 #include "gtkprivate.h"
 #include "gtksnapshot.h"
+#include "gtkstylecontext.h"
 
 #include <gobject/gvaluecollector.h>
 

diff --git a/gtk/gtkcellrenderer.c b/gtk/gtkcellrenderer.c
index 7c176b020c475a8bac5097bc6f1a3ab72d1e1d46..72780c77c907ed2d717d68982a29602818135380 100644 (file)
--- a/gtk/gtkcellrenderer.c
+++ b/gtk/gtkcellrenderer.c
@@ -23,6 +23,7 @@
 #include "gtkmarshalers.h"
 #include "gtkprivate.h"
 #include "gtksnapshot.h"
+#include "gtkstylecontext.h"
 #include "gtktreeprivate.h"
 #include "gtktypebuiltins.h"
 

diff --git a/gtk/gtkcellrendererprogress.c b/gtk/gtkcellrendererprogress.c
index 43f4b138b62bae30e88da6349716bf38c939cf67..1bacf777577b3055c1f087a9db5e39b99ade581f 100644 (file)
--- a/gtk/gtkcellrendererprogress.c
+++ b/gtk/gtkcellrendererprogress.c
@@ -31,6 +31,7 @@
 #include "gtkorientable.h"
 #include "gtkprivate.h"
 #include "gtksnapshot.h"
+#include "gtkstylecontext.h"
 
 
 /**

diff --git a/gtk/gtkcellrenderertext.c b/gtk/gtkcellrenderertext.c
index ddacdc4e3c68413e26c6e6ec095f82c0d908977a..9e6f238aa538328e3ff5109ed6757e9ae8d3ef3f 100644 (file)
--- a/gtk/gtkcellrenderertext.c
+++ b/gtk/gtkcellrenderertext.c
@@ -26,6 +26,7 @@
 #include "gtkprivate.h"
 #include "gtksizerequest.h"
 #include "gtksnapshot.h"
+#include "gtkstylecontext.h"
 #include "gtktreeprivate.h"
 
 #include "a11y/gtktextcellaccessible.h"

diff --git a/gtk/gtkcolorbutton.c b/gtk/gtkcolorbutton.c
index 0c8abded617310f6421a45985729ee6fe9b7bd9e..7e10a78abc1fa9d6ed1fe1c42b25e36da3f6818c 100644 (file)
--- a/gtk/gtkcolorbutton.c
+++ b/gtk/gtkcolorbutton.c
@@ -43,6 +43,7 @@
 #include "gtkmarshalers.h"
 #include "gtkprivate.h"
 #include "gtksnapshot.h"
+#include "gtkstylecontext.h"
 
 
 /**

diff --git a/gtk/gtkcolorchooserwidget.c b/gtk/gtkcolorchooserwidget.c
index 9f2d286017d916f02461c99594ec164a5320634d..8ba5df0d17696cc9120fb5fd3ecf158a0afdf99a 100644 (file)
--- a/gtk/gtkcolorchooserwidget.c
+++ b/gtk/gtkcolorchooserwidget.c
@@ -29,6 +29,7 @@
 #include "gtkprivate.h"
 #include "gtkintl.h"
 #include "gtksizegroup.h"
+#include "gtkstylecontext.h"
 
 #include <math.h>
 

diff --git a/gtk/gtkcssboxesprivate.h b/gtk/gtkcssboxesprivate.h
index d90ba1e598483ef008e5632c1242943fe22fdab8..24a38ff0def6fd866efd79806efc60fe5eb6f0db 100644 (file)
--- a/gtk/gtkcssboxesprivate.h
+++ b/gtk/gtkcssboxesprivate.h
@@ -19,6 +19,7 @@
 #define __GTK_CSS_BOXES_PRIVATE_H__
 
 #include "gtkcsstypesprivate.h"
+#include "gtktypes.h"
 
 G_BEGIN_DECLS
 

diff --git a/gtk/gtkcssimageprivate.h b/gtk/gtkcssimageprivate.h
index 7bdfc23823447435479ff789c41f1c20fe6dde68..f39d73ae8d286d8696285e7bc73a0cf9a98b5b6b 100644 (file)
--- a/gtk/gtkcssimageprivate.h
+++ b/gtk/gtkcssimageprivate.h
@@ -26,6 +26,7 @@
 #include "gtk/gtkcssparserprivate.h"
 #include "gtk/gtkcsstypesprivate.h"
 #include "gtk/gtksnapshot.h"
+#include "gtk/gtkstyleprovider.h"
 
 G_BEGIN_DECLS
 

diff --git a/gtk/gtkcssnodeprivate.h b/gtk/gtkcssnodeprivate.h
index 7335fb30daf22d7a9d7c7221dc6be6a06830e90d..20ef434e7e6b5663be0dc8cf296c9ee56a65ced5 100644 (file)
--- a/gtk/gtkcssnodeprivate.h
+++ b/gtk/gtkcssnodeprivate.h
@@ -23,6 +23,7 @@
 #include "gtkcssstylechangeprivate.h"
 #include "gtkbitmaskprivate.h"
 #include "gtkcsstypesprivate.h"
+#include "gtkstylecontext.h"
 
 G_BEGIN_DECLS
 

diff --git a/gtk/gtkcssparserprivate.h b/gtk/gtkcssparserprivate.h
index 3fb30f91369125ff1aa7fe235b7c882e235b0642..8dd99ff9c5640582a3cff110213602ef348e028a 100644 (file)
--- a/gtk/gtkcssparserprivate.h
+++ b/gtk/gtkcssparserprivate.h
@@ -18,7 +18,6 @@
 #ifndef __GTK_CSS_PARSER_PRIVATE_H__
 #define __GTK_CSS_PARSER_PRIVATE_H__
 
-#include "gtk/gtkcsstypesprivate.h"
 #include <gtk/gtkcssprovider.h>
 
 G_BEGIN_DECLS

diff --git a/gtk/gtkcssshadowsvalueprivate.h b/gtk/gtkcssshadowsvalueprivate.h
index e79a131a1f2c869196065072aac30b207770acb2..fe1cc65816a303c96d61ea1f5c42f0a681e4e743 100644 (file)
--- a/gtk/gtkcssshadowsvalueprivate.h
+++ b/gtk/gtkcssshadowsvalueprivate.h
@@ -23,6 +23,7 @@
 #include <cairo.h>
 #include <pango/pango.h>
 
+#include "gtkborder.h"
 #include "gtktypes.h"
 #include "gtkcssparserprivate.h"
 #include "gtkcssvalueprivate.h"

diff --git a/gtk/gtkcssshadowvalueprivate.h b/gtk/gtkcssshadowvalueprivate.h
index 4633c8abedfe712ecabb9db89a12fc548bed24bf..78d6eacc97bc7a263200aba556597f2503123efc 100644 (file)
--- a/gtk/gtkcssshadowvalueprivate.h
+++ b/gtk/gtkcssshadowvalueprivate.h
@@ -23,6 +23,7 @@
 #include <cairo.h>
 #include <pango/pango.h>
 
+#include "gtkborder.h"
 #include "gtktypes.h"
 #include "gtkcssparserprivate.h"
 #include "gtkcssvalueprivate.h"

diff --git a/gtk/gtkcsstypesprivate.h b/gtk/gtkcsstypesprivate.h
index 0c9ae190d2857bb06e6d2d4b701362473f77550a..ece3703208a8e2bbb52a5cc17829a1878dc991e1 100644 (file)
--- a/gtk/gtkcsstypesprivate.h
+++ b/gtk/gtkcsstypesprivate.h
@@ -20,7 +20,6 @@
 
 #include <glib-object.h>
 #include <gsk/gsk.h>
-#include <gtk/gtkstylecontext.h>
 
 G_BEGIN_DECLS
 

diff --git a/gtk/gtkcssvalueprivate.h b/gtk/gtkcssvalueprivate.h
index 53ba739bcefbbbfb195b9f4c0333abaead74ca80..7aba6b023c66a951920e8f4b3b0600655acff32f 100644 (file)
--- a/gtk/gtkcssvalueprivate.h
+++ b/gtk/gtkcssvalueprivate.h
@@ -21,7 +21,9 @@
 #define __GTK_CSS_VALUE_PRIVATE_H__
 
 #include <glib-object.h>
+
 #include "gtkcsstypesprivate.h"
+#include "gtkstyleprovider.h"
 
 G_BEGIN_DECLS
 

diff --git a/gtk/gtkdialog.c b/gtk/gtkdialog.c
index db6cbac56ea7726a81006b9f1ca99d38941bcf2f..11b4d7be9bd6aba92d2f87663c5ae4eef4b7e704 100644 (file)
--- a/gtk/gtkdialog.c
+++ b/gtk/gtkdialog.c
@@ -44,6 +44,7 @@
 #include "gtksettings.h"
 #include "gtktypebuiltins.h"
 #include "gtksizegroup.h"
+#include "gtkstylecontext.h"
 
 /**
  * SECTION:gtkdialog

diff --git a/gtk/gtkdnd.c b/gtk/gtkdnd.c
index 0313566573ec4586675824a0539a64941be8700e..46aeba742a178ec3df07673cf786f4ab106899bb 100644 (file)
--- a/gtk/gtkdnd.c
+++ b/gtk/gtkdnd.c
@@ -33,6 +33,7 @@
 #include "gtkpicture.h"
 #include "gtkselectionprivate.h"
 #include "gtksettingsprivate.h"
+#include "gtkstylecontext.h"
 #include "gtktooltipprivate.h"
 #include "gtkwidgetprivate.h"
 #include "gtkwindowgroup.h"

diff --git a/gtk/gtkemojichooser.c b/gtk/gtkemojichooser.c
index d59ca4f5ccf4d0b96edb09702b69a210a1faabbe..26fdfb3584d87b45c00522a4556fbe09e2edd000 100644 (file)
--- a/gtk/gtkemojichooser.c
+++ b/gtk/gtkemojichooser.c
@@ -34,6 +34,7 @@
 #include "gtkintl.h"
 #include "gtkprivate.h"
 #include "gtksearchentryprivate.h"
+#include "gtkstylecontext.h"
 #include "gtktext.h"
 
 #define BOX_SPACE 6

diff --git a/gtk/gtkemojicompletion.c b/gtk/gtkemojicompletion.c
index 3c8796f9208b4f525da11a47803e12369d715747..e432128ee7b7f8e518ddf1568d8eb4a847eb9fee 100644 (file)
--- a/gtk/gtkemojicompletion.c
+++ b/gtk/gtkemojicompletion.c
@@ -32,6 +32,7 @@
 #include "gtkeventcontrollerkey.h"
 #include "gtkflowbox.h"
 #include "gtkstack.h"
+#include "gtkstylecontext.h"
 
 struct _GtkEmojiCompletion
 {

diff --git a/gtk/gtkfontbutton.c b/gtk/gtkfontbutton.c
index 3d87ffb103e1240121ede432d8500b89a440d3a6..6e12768c2f27fa373289ee9f392be366cab5ad20 100644 (file)
--- a/gtk/gtkfontbutton.c
+++ b/gtk/gtkfontbutton.c
@@ -29,21 +29,20 @@
 
 #include "gtkfontbutton.h"
 
-#include "gtkmain.h"
 #include "gtkbox.h"
-#include "gtklabel.h"
+#include "gtkcssprovider.h"
 #include "gtkfontchooser.h"
 #include "gtkfontchooserdialog.h"
-#include "gtkimage.h"
+#include "gtkfontchooserutils.h"
+#include "gtkintl.h"
+#include "gtklabel.h"
 #include "gtkmarshalers.h"
-#include "gtkseparator.h"
 #include "gtkprivate.h"
-#include "gtkintl.h"
-#include "gtkcssprovider.h"
+#include "gtkseparator.h"
+#include "gtkstylecontext.h"
 
 #include <string.h>
 #include <stdio.h>
-#include "gtkfontchooserutils.h"
 
 
 /**

diff --git a/gtk/gtkinfobar.c b/gtk/gtkinfobar.c
index 2631fbc624549673224f683f60fc0f608d34bd25..a396264e8928c18b49d91382cfd701832823e840 100644 (file)
--- a/gtk/gtkinfobar.c
+++ b/gtk/gtkinfobar.c
@@ -45,6 +45,7 @@
 #include "gtkintl.h"
 #include "gtkprivate.h"
 #include "gtkorientable.h"
+#include "gtkstylecontext.h"
 #include "gtktypebuiltins.h"
 #include "gtkwidgetprivate.h"
 

diff --git a/gtk/gtklinkbutton.c b/gtk/gtklinkbutton.c
index ee5468aa55fc7f4c97251152262333ef46ab9aec..50f4dfb6da748c34aac2873f705daea2b7ea1ff9 100644 (file)
--- a/gtk/gtklinkbutton.c
+++ b/gtk/gtklinkbutton.c
@@ -65,6 +65,7 @@
 #include "gtkprivate.h"
 #include "gtkshow.h"
 #include "gtksizerequest.h"
+#include "gtkstylecontext.h"
 #include "gtktooltip.h"
 #include "gtkwidgetprivate.h"
 

diff --git a/gtk/gtkmenubutton.c b/gtk/gtkmenubutton.c
index 68eaa1c50bacb3a01a8e7e27a185dfa1b992d241..60b5a2b03456ab3a0df621d99f182e66ffe8a89f 100644 (file)
--- a/gtk/gtkmenubutton.c
+++ b/gtk/gtkmenubutton.c
@@ -110,18 +110,19 @@
 
 #include "config.h"
 
-#include "gtkmenubutton.h"
-#include "gtkmenubuttonprivate.h"
-#include "gtktypebuiltins.h"
-#include "gtkimage.h"
+#include "gtkaccessible.h"
 #include "gtkactionable.h"
+#include "gtkimage.h"
+#include "gtkintl.h"
 #include "gtkmain.h"
-#include "gtkaccessible.h"
+#include "gtkmenubutton.h"
+#include "gtkmenubuttonprivate.h"
 #include "gtkpopover.h"
-#include "a11y/gtkmenubuttonaccessible.h"
-
 #include "gtkprivate.h"
-#include "gtkintl.h"
+#include "gtkstylecontext.h"
+#include "gtktypebuiltins.h"
+
+#include "a11y/gtkmenubuttonaccessible.h"
 
 struct _GtkMenuButtonPrivate
 {

diff --git a/gtk/gtkmessagedialog.c b/gtk/gtkmessagedialog.c
index e98a0ffb99ef6ed94d73cb961972545ae32d7fec..153616831f63e6c018637c5d2c31bcbc28a8d3a6 100644 (file)
--- a/gtk/gtkmessagedialog.c
+++ b/gtk/gtkmessagedialog.c
@@ -25,18 +25,20 @@
 
 #include "config.h"
 
-#include <string.h>
-
 #include "gtkmessagedialog.h"
-#include "gtkdialogprivate.h"
+
 #include "gtkaccessible.h"
-#include "gtkbuildable.h"
-#include "gtklabel.h"
 #include "gtkbox.h"
+#include "gtkbuildable.h"
+#include "gtkdialogprivate.h"
 #include "gtkintl.h"
+#include "gtklabel.h"
 #include "gtkprivate.h"
+#include "gtkstylecontext.h"
 #include "gtktypebuiltins.h"
 
+#include <string.h>
+
 /**
  * SECTION:gtkmessagedialog
  * @Short_description: A convenient message window

diff --git a/gtk/gtkorientable.c b/gtk/gtkorientable.c
index 9612e544e565eea3f308a89f90e3d1594a217f37..70b8e60ff71bb1e76f358accf828011bf819171f 100644 (file)
--- a/gtk/gtkorientable.c
+++ b/gtk/gtkorientable.c
@@ -22,7 +22,9 @@
 #include "config.h"
 
 #include "gtkorientableprivate.h"
+
 #include "gtkprivate.h"
+#include "gtkstylecontext.h"
 #include "gtktypebuiltins.h"
 #include "gtkintl.h"
 

diff --git a/gtk/gtkoverlay.c b/gtk/gtkoverlay.c
index 643ca00d2e9704bfa7372d0ab5d75e64ec210961..0b3c8932c3108a7604076a21d2faa5501bbea10e 100644 (file)
--- a/gtk/gtkoverlay.c
+++ b/gtk/gtkoverlay.c
@@ -21,14 +21,15 @@
 #include "config.h"
 
 #include "gtkoverlay.h"
+
 #include "gtkbuildable.h"
-#include "gtkscrolledwindow.h"
-#include "gtkwidgetprivate.h"
+#include "gtkintl.h"
 #include "gtkmarshalers.h"
-#include "gtksnapshot.h"
-
 #include "gtkprivate.h"
-#include "gtkintl.h"
+#include "gtkscrolledwindow.h"
+#include "gtksnapshot.h"
+#include "gtkstylecontext.h"
+#include "gtkwidgetprivate.h"
 
 /**
  * SECTION:gtkoverlay

diff --git a/gtk/gtksearchbar.c b/gtk/gtksearchbar.c
index 7c0222ef606174c118034ef675518863210f9c37..e774955d3ff6127d9b95539208bacb97937cf405 100644 (file)
--- a/gtk/gtksearchbar.c
+++ b/gtk/gtksearchbar.c
@@ -32,12 +32,13 @@
 #include "gtkbutton.h"
 #include "gtkcenterbox.h"
 #include "gtkentryprivate.h"
+#include "gtkeventcontrollerkey.h"
 #include "gtkintl.h"
 #include "gtkprivate.h"
 #include "gtkrevealer.h"
 #include "gtksearchentryprivate.h"
 #include "gtksnapshot.h"
-#include "gtkeventcontrollerkey.h"
+#include "gtkstylecontext.h"
 
 /**
  * SECTION:gtksearchbar

diff --git a/gtk/gtkseparatortoolitem.c b/gtk/gtkseparatortoolitem.c
index 3cdc517c19d2cc302ada431d6d5863bc66354a36..86cb818fd2bc59256694e5587b5096d9706068ce 100644 (file)
--- a/gtk/gtkseparatortoolitem.c
+++ b/gtk/gtkseparatortoolitem.c
@@ -18,11 +18,14 @@
  */
 
 #include "config.h"
-#include "gtkseparatormenuitem.h"
+
 #include "gtkseparatortoolitem.h"
+
 #include "gtkintl.h"
-#include "gtktoolbarprivate.h"
 #include "gtkprivate.h"
+#include "gtkseparatormenuitem.h"
+#include "gtkstylecontext.h"
+#include "gtktoolbarprivate.h"
 #include "gtkwidgetprivate.h"
 
 /**

diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c
index 0b70835bbf84da32c5d3f37ab4624967b7896a14..354e70a0831aaf7972af5f1fbf17825bf2669432 100644 (file)
--- a/gtk/gtksettings.c
+++ b/gtk/gtksettings.c
@@ -18,22 +18,23 @@
 
 #include "config.h"
 
-#include <string.h>
-
-#include "gtksettings.h"
-
 #include "gtksettingsprivate.h"
-#include "gtkintl.h"
-#include "gtkwidget.h"
-#include "gtkprivate.h"
+
 #include "gtkcssproviderprivate.h"
 #include "gtkhslaprivate.h"
+#include "gtkintl.h"
+#include "gtkprivate.h"
+#include "gtkscrolledwindow.h"
+#include "gtkstylecontext.h"
 #include "gtkstyleproviderprivate.h"
 #include "gtktypebuiltins.h"
 #include "gtkversion.h"
-#include "gtkscrolledwindow.h"
+#include "gtkwidget.h"
+
 #include "gdk/gdk-private.h"
 
+#include <string.h>
+
 #ifdef GDK_WINDOWING_X11
 #include "x11/gdkx.h"
 #include <pango/pangofc-fontmap.h>

diff --git a/gtk/gtkshortcutsshortcut.c b/gtk/gtkshortcutsshortcut.c
index 3e923a34e11c6e32bf12cedd5caaefb9ee8d5e0b..1cbd8e0bf8c440dccbecba7436dd947042e35bc0 100644 (file)
--- a/gtk/gtkshortcutsshortcut.c
+++ b/gtk/gtkshortcutsshortcut.c
@@ -27,6 +27,7 @@
 #include "gtkshortcutlabel.h"
 #include "gtkshortcutswindowprivate.h"
 #include "gtksizegroup.h"
+#include "gtkstylecontext.h"
 #include "gtktypebuiltins.h"
 
 /**

diff --git a/gtk/gtkshortcutswindow.c b/gtk/gtkshortcutswindow.c
index 77f7d297e7dce3a87d33045b8bf2253aaf156f68..1728736541d8403d29807c4b68562662587b3d2a 100644 (file)
--- a/gtk/gtkshortcutswindow.c
+++ b/gtk/gtkshortcutswindow.c
@@ -22,11 +22,13 @@
 
 #include "gtkbindings.h"
 #include "gtkbox.h"
+#include "gtkeventcontrollerkey.h"
 #include "gtkgrid.h"
 #include "gtkheaderbar.h"
 #include "gtkintl.h"
 #include "gtklabel.h"
 #include "gtklistbox.h"
+#include "gtkmain.h"
 #include "gtkmenubutton.h"
 #include "gtkpopover.h"
 #include "gtkprivate.h"
@@ -38,13 +40,10 @@
 #include "gtkshortcutsshortcutprivate.h"
 #include "gtksizegroup.h"
 #include "gtkstack.h"
+#include "gtkstylecontext.h"
 #include "gtktogglebutton.h"
 #include "gtktypebuiltins.h"
 #include "gtkwidgetprivate.h"
-#include "gtkeventcontrollerkey.h"
-#include "gtkprivate.h"
-#include "gtkintl.h"
-#include "gtkmain.h"
 
 /**
  * SECTION:gtkshortcutswindow

diff --git a/gtk/gtkstackswitcher.c b/gtk/gtkstackswitcher.c
index e088ba1ccafb8cac89bbb45d04af8611617719c2..b2fa29307d624e4f5a6a5f8d4cf05e85988b921c 100644 (file)
--- a/gtk/gtkstackswitcher.c
+++ b/gtk/gtkstackswitcher.c
@@ -18,18 +18,21 @@
  */
 
 #include "config.h"
+
 #include "gtkstackswitcher.h"
-#include "gtkradiobutton.h"
-#include "gtklabel.h"
+
 #include "gtkdnd.h"
 #include "gtkdragdest.h"
+#include "gtkimage.h"
+#include "gtkintl.h"
+#include "gtklabel.h"
 #include "gtkorientable.h"
 #include "gtkprivate.h"
-#include "gtkintl.h"
-#include "gtkwidgetprivate.h"
-#include "gtktypebuiltins.h"
-#include "gtkimage.h"
+#include "gtkradiobutton.h"
 #include "gtkselectionmodel.h"
+#include "gtkstylecontext.h"
+#include "gtktypebuiltins.h"
+#include "gtkwidgetprivate.h"
 
 /**
  * SECTION:gtkstackswitcher

diff --git a/gtk/gtktogglebutton.c b/gtk/gtktogglebutton.c
index 2f3b0900b79a917fd56058819fc254916fa475e9..c482a19da01760d8f6dcedd0ae9b793e79c48700 100644 (file)
--- a/gtk/gtktogglebutton.c
+++ b/gtk/gtktogglebutton.c
@@ -24,15 +24,16 @@
 
 #include "config.h"
 
-#include "gtktogglebutton.h"
+#include "gtktogglebuttonprivate.h"
 
 #include "gtkbuttonprivate.h"
-#include "gtktogglebuttonprivate.h"
+#include "gtkintl.h"
 #include "gtklabel.h"
 #include "gtkmain.h"
 #include "gtkmarshalers.h"
 #include "gtkprivate.h"
-#include "gtkintl.h"
+#include "gtkstylecontext.h"
+
 #include "a11y/gtktogglebuttonaccessible.h"
 
 

diff --git a/gtk/gtkviewport.c b/gtk/gtkviewport.c
index 8a8f7e032acea1260d7f53203ac32b487a662ba4..123227405d5c6555f3c6fd463f24784dd68e83a3 100644 (file)
--- a/gtk/gtkviewport.c
+++ b/gtk/gtkviewport.c
@@ -31,6 +31,7 @@
 #include "gtkmarshalers.h"
 #include "gtkprivate.h"
 #include "gtkscrollable.h"
+#include "gtkstylecontext.h"
 #include "gtktypebuiltins.h"
 #include "gtkwidgetprivate.h"
 

diff --git a/gtk/gtkwin32themeprivate.h b/gtk/gtkwin32themeprivate.h
index 9ea7777366b7ab09943534b8961945f813e0a3e1..056e098062b8a361c804e4dab7f4f56a643ed25e 100644 (file)
--- a/gtk/gtkwin32themeprivate.h
+++ b/gtk/gtkwin32themeprivate.h
@@ -20,6 +20,7 @@
 #ifndef __GTK_WIN32_THEME_PART_H__
 #define __GTK_WIN32_THEME_PART_H__
 
+#include "gtkborder.h"
 #include "gtkcssparserprivate.h"
 
 G_BEGIN_DECLS

diff --git a/gtk/inspector/size-groups.c b/gtk/inspector/size-groups.c
index 59ef51e7e64d0a35a197ce44a56a5f7393f5453d..0537edba004dd388a20696222ed181afdf01624f 100644 (file)
--- a/gtk/inspector/size-groups.c
+++ b/gtk/inspector/size-groups.c
@@ -28,6 +28,7 @@
 #include "gtklabel.h"
 #include "gtklistbox.h"
 #include "gtksizegroup.h"
+#include "gtkstylecontext.h"
 #include "gtkswitch.h"
 #include "gtkwidgetprivate.h"